babl: Fix compiler warnings

Avoid redefinition and implicit casts

diff --git a/babl/babl-extension.c b/babl/babl-extension.c
index 3ba28aec5ef381e0b87aaf58b47588361b2e6ac0..1628d038a803ce69ac8262f0d1914705c6b253e0 100644 (file)
--- a/babl/babl-extension.c
+++ b/babl/babl-extension.c
@@ -133,12 +133,15 @@ destroy_hook (void)
 #include <unistd.h>
 
 #ifdef HAVE_DLFCN_H
+#ifndef WIN32
 
 #include <dlfcn.h>
 #define HLIB    void *
 
+#endif /* WIN32 */
 #elif HAVE_DL_H
 
+
 #include <dl.h>
 #include <errno.h>
 #if !defined(DYNAMIC_PATH)
@@ -175,6 +178,10 @@ static void *dlsym (HLIB handle, const char *name) {
 #define dlerror()       GetLastError ()
 #endif
 
+typedef int  (*BablExtensionInitFunc)   (void);
+typedef void (*BablExtensionDestroyFunc)(void);
+
+
 static Babl *
 load_failed (Babl *babl)
 {
@@ -193,8 +200,8 @@ babl_extension_load (const char *path)
   /* do the actual loading thing */
   HLIB  dl_handle = NULL;
 
-  int   (*init)(void)    = NULL;
-  void  (*destroy)(void) = NULL;
+  BablExtensionInitFunc init = NULL;
+  BablExtensionDestroyFunc destroy = NULL;
 
   dl_handle = dlopen (path, RTLD_NOW);
   if (!dl_handle)
@@ -202,7 +209,7 @@ babl_extension_load (const char *path)
       babl_log ("dlopen() failed:\n\t%s", dlerror ());
       return load_failed (babl);
     }
-  init = dlsym (dl_handle, "init");
+  init = (BablExtensionInitFunc) dlsym (dl_handle, "init");
   if (!init)
     {
       babl_log ("\n\tint babl_extension_init() function not found in extension '%s'", path);
@@ -210,7 +217,7 @@ babl_extension_load (const char *path)
       return load_failed (babl);
     }
 
-  destroy = dlsym (dl_handle, "destroy");
+  destroy = (BablExtensionDestroyFunc) dlsym (dl_handle, "destroy");
   babl    = extension_new (path,
                            dl_handle,
                            destroy);